Handle misplaced property elements without asserting.

2007-11-09  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkbuilderparser.c (parse_property): Handle misplaced
        property elements without asserting.

svn path=/trunk/; revision=18976

diff --git a/ChangeLog b/ChangeLog
index 54b3cf3ac6053d14f5b2a62ff417a5bcf8a1687f..425659d63030a48638bb4a679f43bf1f6fdf6274 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkbuilderparser.c (parse_property): Handle misplaced
+       property elements without asserting.
+
 2007-11-09  Kristian Rietveld  <kris@imendio.com>
 
        * gdk/gdkwindow.c (gdk_window_process_all_updates): guard for

diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index a394e1e8f43e650a1fb39b82997b786c39d8121f..b06df7951a48fd6bda22b8d14a14b66d13753789 100644 (file)
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -379,7 +379,11 @@ parse_property (ParserData   *data,
   gboolean translatable = FALSE;
   int i;
 
-  g_assert (data->stack != NULL);
+  if (data->stack == NULL) 
+    {
+      error_invalid_tag (data, "property", NULL, error);
+      return;
+    }
 
   for (i = 0; names[i] != NULL; i++)
     {